fix build when not using grant tables for blkdev.

Signed-off-by: Steven Hand <steven@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
index f44c70eb0344d7c82bd4cd115b49a723ed020ac1..969ed44023b6fc6df946fd673df5f763a226ce65 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
@@ -541,11 +541,12 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req)
     else
         remap_prot = _PAGE_PRESENT|_PAGE_DIRTY|_PAGE_ACCESSED;
 
+
     for ( i = 0; i < nseg; i++ )
     {
        MULTI_update_va_mapping_otherdomain(
            mcl+i, MMAP_VADDR(pending_idx, i),
-           pfn_pte_ma(seg[i].buf >> PAGE_SHIFT, remap_prot),
+           pfn_pte_ma(seg[i].buf >> PAGE_SHIFT, __pgprot(remap_prot)),
            0, blkif->domid);
 #ifdef CONFIG_XEN_BLKDEV_TAP_BE
         if ( blkif->is_blktap )